merge trunk
authorKenichi Handa <handa@m17n.org>
Tue, 13 Dec 2011 23:35:52 +0000 (08:35 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 13 Dec 2011 23:35:52 +0000 (08:35 +0900)

Trivial merge